am e14f3146: Merge "Fix expectations to track Charset test package changes."

* commit 'e14f3146f5029eb898ab48930e2ac6af95c62f90':
  Fix expectations to track Charset test package changes.