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

* commit 'd65cb22872b5dbfb5937d66191b60be22b63fd21':
  Final resource IDs.