Merge "Merge CellInfo TYPE Enums"
am: d3395b08c2

Change-Id: I18ad60a58b133cb6bb1c4a1523d0f3eeef4122c2