upgrade to build 352 and guava 15