Merge "Fix race condition for getSubscriberId" into pi-dev