DO NOT MERGE: Merge Oreo MR1 into master

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