Fix combination of java wrapping and testing off.

Change-Id: I451626004ef93bf1e42f393c6af8f87cf06dec57
Merge topic 'java_sans_testing' into master

26acf648 Fix combination of java wrapping and testing off.