resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5 am: f47f5ecf0b
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:25:16 +0000 (18:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:25:16 +0000 (18:25 +0000)
am: 47091c824b

Change-Id: Ic42562aad89852a5d04f8830d67d5ca7010bd42f


Trivial merge