DO NOT MERGE: Merge Oreo MR1 into master

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