DO NOT MERGE: Merge Oreo MR1 into master

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