Merge change 1791 into donut

* changes:
  Add a method to get the PhoneType in CellLocation.