Merge remote branch 'goog/gingerbread' into manualmerge