Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev