merging constants.java file changes

merging constants.java file changes