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

Change-Id: I70424f2b6496a06127a9d7ae07922eb1a6990c83