am e350522c: Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev

* commit 'e350522c5c44c411d5a69a956c2ce76b97b2e52d':
  increase wait timeout and reduce dequeue buffer time-out