Merge remote branch 'goog/gingerbread' into manualmerge

Change-Id: I9ec4b97612365d5b10908da2dd45c4b03c9af3c2