Merge "Add better debug output for ResourceType errors" into gingerbread