resolve merge conflicts of 037808f59 to oc-mr1-dev
authorMika Isojärvi <misojarvi@google.com>
Sat, 23 Sep 2017 00:10:38 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Sep 2017 00:10:38 +0000 (00:10 +0000)
am: 863b6fc0e5

Change-Id: I6e195a2d90507f9d358e3fe3cf50cc78446bfadc


Trivial merge