DO NOT MERGE: Merge Oreo MR1 into master

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