DO NOT MERGE: Merge Oreo MR1 into master

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