Merge "keystore2: Bump KM import to version 3"