Merge "Move the guts of Resources to ResourcesImpl" into nyc-dev