Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev