Merge "Add version code constant for JB MR2." into jb-mr2-dev