DO NOT MERGE: Merge Oreo MR1 into master

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