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

Change-Id: I3c51fdf7be0bd5b9c0de6d54d65b6776661e5e9e


Trivial merge