DO NOT MERGE: Merge Oreo MR1 into master

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