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

Change-Id: Ie6f1c5f868a449dc2eebeef03c7e11897fd58553


Trivial merge