DO NOT MERGE: Merge Oreo MR1 into master

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