Merge remote branch 'goog/froyo' into mm