Merge "Fix race condition" into rvc-dev am: 3f634b45e1 am: 3939060ace am: 79f0e944ed

Change-Id: I3169ff265f94f0379b4af3dfd7a7606ad5f2ea73