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

* commit '1f46d79faf1b947b3d169c336e013cea89e8de11':