am 019a55d1: Merge "Revert "Set up final resource identifiers."" into lmp-dev

* commit '019a55d1976b1611c9a6a57b094ca0b1da8bb469':
  Revert "Set up final resource identifiers."