Merge "Fix NPE in Signature getCurrentSpi."