am cd8204b4: 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 'cd8204b4a5619663a63f909af3b6dab7ba0b01bc':
  increase wait timeout and reduce dequeue buffer time-out