DO NOT MERGE: Merge Oreo MR1 into master

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