DO NOT MERGE: Merge Oreo MR1 into master

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