am 31ee50d0: Merge change I5f14b939 into eclair-mr2

Merge commit '31ee50d0d9618117b7f09d2720e6e0e05ca8fce2' into eclair-mr2-plus-aosp

* commit '31ee50d0d9618117b7f09d2720e6e0e05ca8fce2':
  Getting rid of some dead code