Merge "Fix unknown resource type error message" into qt-dev
am: dd76b346d4

Change-Id: I1af6f93d990a940876dbb65fe7b158ff6a81a576