Merge changes I219c2b3a,I7af6fe67 am: 01cc5733ba am: 7d8ddf4d02
authorMika Isojärvi <misojarvi@google.com>
Mon, 25 Jul 2016 20:51:00 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:51:00 +0000 (20:51 +0000)
am: 822f089731

Change-Id: I3596251a9560493e588420384a7d1c85dec63b39


Trivial merge