Merge "Fix race condition" into rvc-dev am: 3f634b45e1 am: 3939060ace

Change-Id: I7c87396d993e1861e22c0b6a1e60cfb083d86c80