Merge "Fix SignatureBuilder." am: d1219acf84 am: a8aa26d1ed
am: cb84d0811c

Change-Id: I2c9be5a7db203e1fef778fd44bac9b5da189f248