Merge "Modify JAVA Env Setting"