DO NOT MERGE: Merge Oreo MR1 into master

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