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

* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
  Make sure resource references are resolved.