These resulted in 4MB jars that contained lots of unnecessary dependencies. Change-Id: I392c808e6ef84b6c6d9cf8798d8fd683d1e68083