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

Change-Id: I4089902082a8b17d99162ca51fa85a975e9d5fed