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

* commit '6d45f2793eed19dbdb3922ea6d9113d4deaa37fb':
  Final resource IDs.