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

Change-Id: I370090953e74aa65427cd87372b6a9f8c5271477


Trivial merge