am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1

* commit '22701ec5b11f6138e6298814fff5f09da82df144':
  Make sure resource references are resolved.