am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev

* commit '2bbea56d1258f7b55183ddba6364815f17aafe88':
  Final resource IDs.