am d6ad59ae: am 51c66b1b: am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit 'd6ad59ae43591b025a2ed7a438120aa970204a0d':