Merge remote branch 'goog/froyo' into merge_froyo_to_market-0