Merge change 9535 into donut

* changes:
  Fix the DeviceChooserDialog table issues.