Merge "Fix two cosmetic issues in signapk."