resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557
authorKalle Raita <kraita@google.com>
Tue, 20 Dec 2016 22:20:20 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:20:20 +0000 (22:20 +0000)
am: 900673646e

Change-Id: Ie357de73c562ce54ef3b8192c156822dc45f78c7


Trivial merge