Merge change 25976 into eclair

* changes:
  Fix adapter name change problem.