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

* commit 'b959cbed6160127f44dd8b9fbba3df045ca0e850':