am 5c97e9d9: am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread

* commit '5c97e9d98566fcd4b6a702252223bb85d637259f':