DO NOT MERGE: Merge Oreo MR1 into master

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