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

Change-Id: I793407405110512ba39ff483b9a544e57a6ce6cf