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

Change-Id: Ia8136080aa1caa890c325ed4ed538e3f08456d21


Trivial merge