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