Merge "Support importing property file with expanded name"