DO NOT MERGE: Merge Oreo MR1 into master

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