DO NOT MERGE: Merge Oreo MR1 into master

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