DO NOT MERGE: Merge Oreo MR1 into master

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