DO NOT MERGE: Merge Oreo MR1 into master

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