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

Change-Id: I1a7c1e97354c43a561d91413191fb3b65f5d4f5a


Trivial merge