Merge change 23388 into eclair

* changes:
  DDMS now queries the VM for its features.