Merge "Remove CellLocation from RadioInfo"