Merge "Handle devices with no telephony. DO NOT MERGE" into jb-dev