am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread

* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612