Merge "Fix SignatureBuilder."
am: d1219acf84

Change-Id: I5cba47131a355a5dfb8ec0f653d47fb9a13bf161