Merge "Fix Java code style references"