XD-1985 - Guava packaging cleanup - take 2