Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev