DO NOT MERGE: Merge Oreo MR1 into master

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