resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a7...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 19:39:29 +0000 (19:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:39:29 +0000 (19:39 +0000)
am: a1d7048d03

Change-Id: I1ba478d3d4dc3c3a881260781bf143b0b7ef2e0f


Trivial merge