DO NOT MERGE: Merge Oreo MR1 into master

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