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)
commit5ea85b4a84dd65bb702988f44bc0f7e08e5c6462
treee2a91836a8bc69de69e66b47cdefa81f43ad8742
parent8df1a93dcaac90d7c08ff30d26dcc09aeb47037e
parent3685bc758d7a1e91a6c2e627c5758d2a3b3ab0d9
Merge remote-tracking branch oreo-mr1-cts-dev into 

Test: presubmit
Bug: 69859815
Change-Id: I47e94db994e07a7b159d840d1a2283bf072eb09f