resolve merge conflicts of 037808f59 to oc-dr1-dev-plus-aosp
authorMika Isojärvi <misojarvi@google.com>
Mon, 25 Sep 2017 15:50:29 +0000 (15:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Sep 2017 15:50:29 +0000 (15:50 +0000)
am: 405ea7d9a5

Change-Id: I45a9f663e6ca640fe8b9641027aea2494d8b4293


Trivial merge