Merge "Change Nci to CellInfo.UNAVAILABLE_LONG"