DO NOT MERGE: Merge Oreo MR1 into master

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