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

Change-Id: If6f52d32b3875bba642d0215831a634404872a73


Trivial merge