Merge "update keystore cert"