Merge "Wait for idmap service on current thread" into rvc-dev am: 6831d480 am: 5cb51599 am: 7f9698f0 am: f8fc62c3 Change-Id: I68b8f029c28d80c55c5e18c74e0d795b2d8499e5