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

* commit '35aaebdd97b53320a060d9b419bd3495e1d83803':