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

Change-Id: I0de981e47bba7261d547af21da577705a243380d


Trivial merge