Merge "Make APIs in the base CellInfo class public."