Merge "Fix race condition" into rvc-dev am: 3f634b45e1 am: 3939060ace am: 2ed86d1455 am: abb9ae719c

Change-Id: Iedbb1d9c7d524f803b2f05a1fa8b740197962d90