Merge "Support getResource*Name() methods for Resources" into nyc-dev