Merge "Promoting a function from Gsm/Cdma CellLocation classes to parent class"