Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev