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

Change-Id: I0ccabdc141c4c775f079133ad137bff795e0c965