Merge "Move Exchange away from the @hidden Charsets class."