Merge "Rename CellInfo Functions for Clarity"
am: c0be64051f

Change-Id: Icf58e9937780637c368d684d7b8665afd34ed611