DO NOT MERGE: Merge Oreo MR1 into master

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