DO NOT MERGE: Merge Oreo MR1 into master

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