Removed ZhClient; unused by core and extensions

Change-Id: Ieda34368b8e1c4a09dc244f47f7e09d943849b1e
Merge "Removed ZhClient; unused by core and extensions"