Merge changes I1aa11f40,Ia707a806 into qt-dev

* changes:
  Fix dumpstate tests
  dumpstate: Increase timeout for lshal