Merge "Update keystore to use KM4.1."