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

Change-Id: I4bc3a7ee319948076137188975e37886d705df2d


Trivial merge