am 27016763: merge from gingerbread

* commit '27016763c7c0e568fb8eb26ab3d30282f027a72d':