Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev