Merge "Revert "Use system/audio to/from string converters in TypeConverter""