DO NOT MERGE: Merge Oreo MR1 into master

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