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

Change-Id: I5e54dda493336d0690a366efae0c0301df343bbf


Trivial merge