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
* commit 'f2ddee26':
Change-Id: Ieb1d7c1cb2143ef090c1765e04f492d4ce8d2075