Merge "Some debugging help for issue #2594388" into froyo