am 3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev

* commit '3edf207a922c24df349e6f9ffadb2bdc5b18d3c2':
  Assign final resource IDs for JB MR2.