DO NOT MERGE: Merge Oreo MR1 into master

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