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

Change-Id: I70e81b50d48fdf08a2f97334bf6fae5b6d538a92