DO NOT MERGE: Merge Oreo MR1 into master

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