DO NOT MERGE: Merge Oreo MR1 into master

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