Merge "Allow overriding of strings referenced in XML files."