Merge change 460 into donut

* changes:
  More optimization of dumpsys output.