resolve merge conflicts of ba455914 to master
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)
am: 07a7e24da3

Change-Id: Iece28ec157fd5f603009ffb6fc9023cc0164ab1d


Trivial merge