DO NOT MERGE: Merge Oreo MR1 into master

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