fix java issue

Change-Id: I531aebf97808c79060495f9480ece199344a562f
Merge topic 'java-fix' into master

6e873b5a fix java issue