Merge "Use resource encoding in getFileRevisionTypedElement"