DO NOT MERGE: Merge Oreo MR1 into master

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