Merge "RESTRICT AUTOMERGE: rvc-dev is BUILD_ID=RVC" into rvc-dev am: e2ff54f07c am: 125765fa79

Change-Id: Ia79be0bc43c2e47956f513c2de7e81cbd5dd492b