DO NOT MERGE: Merge Oreo MR1 into master

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