DO NOT MERGE: Merge Oreo MR1 into master

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