DO NOT MERGE: Merge Oreo MR1 into master
authorXin Li <delphij@google.com>
Wed, 6 Dec 2017 19:51:52 +0000 (11:51 -0800)
committerXin Li <delphij@google.com>
Wed, 6 Dec 2017 22:24:46 +0000 (14:24 -0800)
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I71216cb23c2124938de9ae2a75b7cd7a0811d57f


Trivial merge