Merge "Revise and update CellInfo API's"