Merge "Fix wrong index access in getSingleMessageFromIcc()"