Merge "getSingleMessageFromIcc does not make sense"
am: 596a3b0b73

Change-Id: I6b1ae0a6007a67d9ccb39f9e0bcf93e2a32cbf4c