Merge "Merge CellInfo TYPE Enums" am: d3395b08c2 am: d21d855932
am: d827e4b6ad

Change-Id: I45c0eaf925f99bbd0704bc6dbfbe55243e2e28c9