Exempt-From-Owners-Approval: rebase to fix rvc-dev BUG: 156391112 am: ec8f265723 am: de30899aa2

Change-Id: Ib977025c971cae5d7d594753456bfde2557cb042