DO NOT MERGE: Merge Oreo MR1 into master

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