DO NOT MERGE: Merge Oreo MR1 into master

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