Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:17:07 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:17:07 +0000 (00:17 +0000)
am: c3801f447c

Change-Id: I161050b3925295ab2ede4bb46198bc7d42023de8


Trivial merge