DO NOT MERGE: Merge Oreo MR1 into master

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