Fix test fallout from the switch to canonical encoding names.

Change-Id: I3079def9599ca5910a7c99a901e4cbad01324bce
2 files changed