DO NOT MERGE: Merge Oreo MR1 into master

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