am 8e9d20b3: am 27016763: merge from gingerbread

* commit '8e9d20b3c4c78cf04db9d1bef8a1438f848cd944':