DO NOT MERGE: Merge Oreo MR1 into master

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