Merge "Final resource IDs." into lmp-mr1-dev