Merge "getSingleMessageFromIcc does not make sense" am: 596a3b0b73 am: b615a887ea
am: 8475fa5c99

Change-Id: I3b71e5409321a7241cd144cb7a80d3fff9b68f13