Merge "Improve code quality in ResourceConfig"