DO NOT MERGE: Merge Oreo MR1 into master

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