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

Change-Id: Ieaa589c1bf7220cb2c8abbd20170853cb8f6c319


Trivial merge