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

Change-Id: I0c6ad62d74503b54050efecca8ff796a775b0f59