Merge "Rename vpnprofilestore to legacykeystore." into sc-dev