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

Change-Id: I11852c268e06d01b5a8a661b8ae3d6ae10deeedf