DO NOT MERGE: Merge Oreo MR1 into master

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