Merge "Fix issue #28641630: Service client dumps are timing out for no reason"...
Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev am: 8f359afd am: f2ddee26
am: 0439cf9c
* commit '0439cf9c':
Change-Id: I0bc8969223ccafae8c84fba1286e76383d73382c