DO NOT MERGE: Merge Oreo MR1 into master

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