Merge "Fix bug: 2609027." into froyo