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

Change-Id: I16f210f7fa3dae8994f5b62fafb28dfe61cb9d9d


Trivial merge