DO NOT MERGE: Merge Oreo MR1 into master

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