resolve merge conflicts of eb48f49dd to oc-dev
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:06:48 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:06:48 +0000 (18:06 +0000)
am: 7e37841e4f  -s ours

Change-Id: Id0436a84f2f097836264f593a7154475e1e328ab


Trivial merge