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

Change-Id: Ic5adfaed688b21a0d0c90cc5075d63662777ca74