Merge "Add some debug code to try to track down issue 3183612" into gingerbread