Merge remote branch 'goog/froyo' into merge_froyo_into_qsb-market-0