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

Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b