am 8ebbef7e: Merge change 9535 into donut

Merge commit '8ebbef7eff1d0942876e5d71dbc0c55eda0bd527'

* commit '8ebbef7eff1d0942876e5d71dbc0c55eda0bd527':
  Fix the DeviceChooserDialog table issues.