Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev