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

Change-Id: I0823ca66a8552effc0b7e37c2225e36e7b3367c0