am 3c84c30a: am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1

* commit '3c84c30a8605b56d63847081eaba79562dc1fa83':