DO NOT MERGE: Merge Oreo MR1 into master

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