DO NOT MERGE: Merge Oreo MR1 into master

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