DO NOT MERGE: Merge Oreo MR1 into master

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