Upgrade to gson 2.2.4