Merge "Fix a failure in signing test"