Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev