DO NOT MERGE: Merge Oreo MR1 into master

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