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

* commit '9b7c1274ddba8db2842431649d46c4cef510131f':
  Improve error reporting for issue #3183612