am 5bc88b9f: Merge "Final resource IDs." into mnc-dev

* commit '5bc88b9f46a17d6578d8f8a8b93c7c607d06e063':
  Final resource IDs.