Remove only usage of V4GuidGenerator from Client

Step towards being able to move V4GuidGenerator and associated code out of Lib

Change-Id: Iac13842916c8be8b4b3388584a0f27451e318c13
Merge "Remove only usage of V4GuidGenerator from Client"