Merge "Exempt-From-Owners-Approval: rebase to 8e4315a1d702627f5ddc7b91d942986bdcf577ea BUG: 160902031 am: 5aa2a225d8 am: cc4c1e168e" into rvc-d1-dev-plus-aosp