DO NOT MERGE: Merge Oreo MR1 into master

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