am d6ad59ae: am 6389fa31: am 68cb323d: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit 'd6ad59ae43591b025a2ed7a438120aa970204a0d':