DO NOT MERGE: Merge Oreo MR1 into master

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