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

Change-Id: I4a111600f43d6a55ce6d65aa199b99c08e5dac9e