Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." into sc-dev