Merge "Fix race condition" into rvc-dev am: 3f634b45e1

Change-Id: I90ba8770728c76460bff246e7d8f235006a25ef5