Merge "Migrate VpnProfile definition to framework."