DO NOT MERGE: Merge Oreo MR1 into master

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