Merge "Make java constants consistent with native counterparts." into jb-dev