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

Change-Id: I1fbb12d4cb5aae28107ef22fdd6cc6ceb4ce0ed0


Trivial merge