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

* commit '9cde04553b6d2be246d0a31be9298ab1ef0ab5f1':
  Final resource IDs.