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

Change-Id: I116d704e223e6032fd0e7ccadb5d3c78554630bd