Merge "Fix guava classpath" am: 149fa628e5
am: e26a878cd8

Change-Id: I950f20693bf866b96cae284defc5692f6d19f8c8