DO NOT MERGE: Merge Oreo MR1 into master

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