Merge "getSingleMessageFromIcc does not make sense"