am ae18ca5c: Merge change 20140 into donut

Merge commit 'ae18ca5ceb7ebe376288c8c7653d2c3875f1d18e'

* commit 'ae18ca5ceb7ebe376288c8c7653d2c3875f1d18e':
  Work on issue #2030135: Device sluggish