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

Change-Id: Ib6bed58937e4199da70bb2d7e94656ab394c612c