Merge "Fix memory leak in keystore"