Merge remote branch 'goog/froyo-ub-qsb' into merge_froyo-ub-qsb_to_froyo