DO NOT MERGE: Merge Oreo MR1 into master

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