DO NOT MERGE: Merge Oreo MR1 into master

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