Merge "Fix test failure with --size-limit"