Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release