Merge remote-tracking branch oreo-mr1-cts-dev into master.
authorXin Li <delphij@google.com>
Thu, 4 Jan 2018 21:57:05 +0000 (13:57 -0800)
committerXin Li <delphij@google.com>
Thu, 4 Jan 2018 21:57:05 +0000 (13:57 -0800)
Test: presubmit
Bug: 69859815
Change-Id: I47e94db994e07a7b159d840d1a2283bf072eb09f


Trivial merge