DO NOT MERGE: Merge Oreo MR1 into master

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