DO NOT MERGE: Merge Oreo MR1 into master

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