Merge "Fix 2656989. Clean up update to updated system applications." into froyo