Merge commit 'goog/master' into froyo-release