am 8ceb5021: am 1379b508: Merge "Set up final resource identifiers." into lmp-dev

* commit '8ceb5021de9b75376e7e52b7ef7e5631fdd5846c':
  Set up final resource identifiers.