am c5ee4c34: Merge "Fix GB-18030 tests."

* commit 'c5ee4c34f703a21e0332261827820fe669c97dc8':
  Fix GB-18030 tests.