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

Change-Id: I008b5f61e4e68e6783cffd2d2fe5cc11fc10e814


Trivial merge