Merge commit 'goog/froyo' into froyo-release