DO NOT MERGE: Merge Oreo MR1 into master

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