DO NOT MERGE: Merge Oreo MR1 into master

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