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

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