Merge changes from topic "abandon-race" into rvc-dev am: 6b58f8ca37 am: 8670782013

Change-Id: I46203adfe4ab0f466362812372c16480effd9897