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

Change-Id: I9511ee86a53661327a19ca4793e45ac933cb2d1c


Trivial merge