DO NOT MERGE: Merge Oreo MR1 into master

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