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

Change-Id: Ic37dae007a1df9278b390b3eb9ab5891767a387a