am 501dbaea: am 6dbdcd55: am db71bda6: Merge from gingerbread

* commit '501dbaea037aa1641baae1bca425c2111fbb9be5':