DO NOT MERGE: Merge Oreo MR1 into master

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