Add all G2 varients

Change-Id: Ib42a8f422dfcc3e12f9fad9569211ac57a706d59