Merge "Rename CellInfo Functions for Clarity" am: c0be64051f
am: 8d2eb4243b

Change-Id: Ic7c6ff57326342c0d3315b0d5c085aa98c01779e