Add g2 variants

Change-Id: I0d779dd095b235c90bd91f2b439d3b6b3aecc858