am 375afcd5: am 4b8ad9ef: Merge from gingerbread

* commit '375afcd5d69f47c85960270bf51b83a2b768d446':