Merge "Don't send null data call list response" into tm-dev