DO NOT MERGE: Merge Oreo MR1 into master

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