resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:07:48 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:07:48 +0000 (18:07 +0000)
am: eeb08c7a18

Change-Id: I9d948105b5a8c37ec3d178011e4846861b873c52


Trivial merge