DO NOT MERGE: Merge Oreo MR1 into master

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