Merge "Fix keystore_backend_binder"