DO NOT MERGE: Merge Oreo MR1 into master

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