DO NOT MERGE: Merge Oreo MR1 into master

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