Merge remote branch 'goog/froyo-ub-qsb' into merge-ub-qsb-to-froyo