Make the warning message more human readable.

Change-Id: I4d238bd2c60607b985401da472f591b39f05699f
Merge topic 'human_friendly_warning_message' into master

89c646c9 Make the warning message more human readable.