Merge "Update CellInfo API to accomodate new fields." am: 7e73c73f89 am: 4dac182030
am: 55373d0549

Change-Id: I39620f4dd3afd57835c1c48e36e94f8028102edb