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

* commit '14dd6ebff64af8d991680b7dda2286cd1d578c06':
  Final resource IDs.