sync with fog master and gce v1 update branch