DO NOT MERGE: Merge Oreo MR1 into master

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