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