am 6923ff27: (-s ours) am 9a647f1b: Merge "Handle devices with no telephony....
am 6923ff27: (-s ours) am 9a647f1b: Merge "Handle devices with no telephony. DO NOT MERGE" into jb-dev
* commit '6923ff27':
Handle devices with no telephony. DO NOT MERGE