DO NOT MERGE: Merge Oreo MR1 into master

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