am e343d0a0: am 59c06496: am 4905b06e: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4  -s ours automerge: 8c94827

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