am d3cd4db0: am 8e9d20b3: am 27016763: merge from gingerbread

* commit 'd3cd4db0f755ad1a147aef8354aacce006a09797':