Merge "Support new CellInfo fields."