DO NOT MERGE: Merge Oreo MR1 into master

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