restored gce dmi checking
Merge branch '6-stable-gce-metadata-update' into 6-stable