Merge "IMapper: change an error message" into qt-dev am: 52f5328bd3
am: 789e7bf195

Change-Id: I0619028c86e15990fad89af043b05914ce47be71