Merge "Fix SignatureBuilder."