DO NOT MERGE: Merge Oreo MR1 into master

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