Merge "Make APIs in the base CellInfo class public."
am: 987d1d04d7

Change-Id: I572a275b72ca5c8b7023512d64538e604a19343a