Merge nougat-mr1-cts-dev into master. am: 2dcacdbe0a am: b196334de5
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 21:15:27 +0000 (21:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 21:15:27 +0000 (21:15 +0000)
am: 769492af1d

Change-Id: Ic9c6eec0b2d1cee2c2efa20531720eb6fb77745b


Trivial merge