Improvements Java templates

Change-Id: I34b8e2f5087e0ee5b6d40e1285a71b50cf59aa6f