Merge "Update ks_err on Keystore security code"