Merge "keystore2: Remove remote provisioning logic"