DO NOT MERGE: Merge Oreo MR1 into master

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