g2vzw ==> g2 ish

Change-Id: Ic09d7b009aaa4a90201eff926a5ea75056a1ebfb