DO NOT MERGE: Merge Oreo MR1 into master

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