g2: make it omni

Change-Id: Ib8895e6808cf9546d30cf2aff359cd05ba979900