Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba am: 7d8ddf4d02 am: 822f089731
authorMika Isojärvi <misojarvi@google.com>
Tue, 22 Aug 2017 17:23:07 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:23:07 +0000 (17:23 +0000)
am: 80354cd561

Change-Id: I22f7a641721ebb02f8ef97fc6c99873500de3dc3


Trivial merge