Merge "Merge "Wait for idmap service on current thread" into rvc-dev am: 6831d480 am: 5cb51599 am: 7f9698f0" into mainline-prod