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

Change-Id: I6c6ac9d9d7808997d62130afa20ac3f9c088c4d7