resolve merge conflicts of cc5cabd to nyc-mr1-dev
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 22:16:21 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:16:21 +0000 (22:16 +0000)
am: 7a338a6626

Change-Id: I195a7d513828433103a20331bbe5eb1ee167a4f3


Trivial merge