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

Change-Id: I582bdbc5d438c490fd3a0bc12a623b49221b64e8


Trivial merge