DO NOT MERGE: Merge Oreo MR1 into master

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