resolve merge conflicts of 9b726ab8 to master
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 20:21:08 +0000 (20:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Sep 2017 20:21:08 +0000 (20:21 +0000)
am: 02473c7876

Change-Id: Ibd5f5c37ad2e3590fe5fa4d3512985178c0fb2a9


Trivial merge