Merge "Fix test fallout from the switch to canonical encoding names."