Merge "Fix 2578016." into froyo