am bda6b585: More CTS cleanup

Merge commit 'bda6b58510265c32453985bc49624786fca56e64' into eclair

* commit 'bda6b58510265c32453985bc49624786fca56e64':
  More CTS cleanup