DO NOT MERGE: Merge Oreo MR1 into master

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