DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I740d89c461524ff889b99ff8f8d56da5579d4194