Ben Gilad 6adbaf70f3 Addressing the TODO to rename CallServiceInfo.
Also removing some unused imports etc.

Change-Id: I48176d5394aee0110f3b7a081a1a616b72b574b9
2014-02-20 17:09:04 -08:00
..