Merge "Fixing bug #2591288" into froyo