am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread

* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612