DO NOT MERGE: Merge Oreo MR1 into master

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