am 8d5250c6: am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread

Merge commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf'

* commit '8d5250c601504da7a7fde3a3fd7b1c51335becdf':
  Add better debug output for ResourceType errors