Merge "Fix race condition" into rvc-dev am: 3f634b45 am: 3939060a am: 2ed86d14 am: abb9ae71 am: 025a3749 Change-Id: Ifcf65b890833748b86fb4ba0dccfbf4a54050300