Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev
automerge: dcf21f4  -s ours

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