DO NOT MERGE: Merge Oreo MR1 into master

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