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

Change-Id: Ia40f2f5611422515f5d4ebec0bf539f8043f7220