DO NOT MERGE: Merge Oreo MR1 into master

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