DO NOT MERGE: Merge Oreo MR1 into master

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