DO NOT MERGE: Merge Oreo MR1 into master

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