Merge "Support getResource*Name() methods for Resources" into nyc-dev
am: 90b6454

* commit '90b6454cb319573ec79807c14ae9cc70f9ac4f80':
  Support getResource*Name() methods for Resources