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

Change-Id: Ib25afbf03262430b1d6f6e9a15975354f45ab4ad


Trivial merge