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

Change-Id: Ifcf65b890833748b86fb4ba0dccfbf4a54050300