DO NOT MERGE: Merge Oreo MR1 into master

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