Merge "registration: Apply ResourceFileModulePaths to all modules"