resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a am: eeb08c7a18
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:10:21 +0000 (18:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:10:21 +0000 (18:10 +0000)
am: d5dbe5eec1

Change-Id: Ide7ff8ab768878a04485f8e0c33ca08d34f775f4


Trivial merge