add timeout support for countDownLatch

Change-Id: I3008cae50572772997a2fd9ed9fe9a38f5481207
Merge "add timeout support for countDownLatch"