am f5169178: am ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case.

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

* commit 'f5169178b774f1e602394403b1fe1fc45436e216':