Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 16:57:19 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 16:57:19 +0000 (16:57 +0000)
am: 83683a367f

Change-Id: I29dee0d68369668c015578941b19c1a04ad12026


Trivial merge