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

Change-Id: I11e72c42e4174836f02995deb61e5126126e39b7