Add g2 variants for support

Change-Id: I614c3eef40e8118632e3c91f58089cb636b0d0a6