DO NOT MERGE: Merge Oreo MR1 into master

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