Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:34:38 +0000 (02:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:34:38 +0000 (02:34 +0000)
am: 4812d6d47f

Change-Id: I6c5c6201bedac30702f65c2633454dc6bd27b4a5


Trivial merge