DO NOT MERGE: Merge Oreo MR1 into master

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