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