Merge "Fixing wrong xml refenrece when the packageName is changed"