am 1bf258e4: Update to accomodate IM unbundling.

Merge commit '1bf258e4a6b3f2ea1c5494f16cfc414994508ca8' into eclair-mr2-plus-aosp

* commit '1bf258e4a6b3f2ea1c5494f16cfc414994508ca8':
  Update to accomodate IM unbundling.