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

* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612