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

Change-Id: I4d80ab4fe02c0c7209365b08bf64358f6f7979e8


Trivial merge