am 299a994f: am 83f51c6e: am 6b047a3c: am 6cf0ec54: am 01173cb8: am 7acc9e66: am 201ba877: am 56d5cd90: am 02c406cf: am 8c948271: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4  -s ours

* commit '299a994f4039a4abc8d2f2d983eb94f27c6a618e':