change to uuid v4 as per Google update on cid
Merge remote-tracking branch 'origin/uuid_update' into 2-1-stable

* origin/uuid_update:
  change to uuid v4 as per Google update on cid