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

Change-Id: I34f00e32575cbf482fd192b16368789a9fb80081


Trivial merge