merging changes in constants.java file

merging changes in constants.java file