DO NOT MERGE: Merge Oreo MR1 into master

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