Merge "Fix GB-18030 tests."