Merge "adapt vFW, vDNS, and VOLTE to new framework"