am cc96ede2: am 20aec2dd: Merge change I830df4b1 into eclair

Merge commit 'cc96ede29a0844b2bdc5174e8bc5d156b589bd4f' into eclair-mr2-plus-aosp

* commit 'cc96ede29a0844b2bdc5174e8bc5d156b589bd4f':
  addresses several bugs: 2206097, 2166583, 2261119, 2216759