Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba
authorPyry Haulos <phaulos@google.com>
Mon, 25 Jul 2016 20:48:34 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:48:34 +0000 (20:48 +0000)
am: 7d8ddf4d02

Change-Id: I4a2e8bb5d0a016f094aa5c40b6717a14c4c6166f


Trivial merge