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

Change-Id: Ife84a2c737a0f790a334d8a9446053d63f465621