am c14d4c6c: am b959cbed: am 2dfe79f2: am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit 'c14d4c6c9386e7e1711b2caef3e53d3480a0c888':