g2-common: make omni compatible

Change-Id: I01c664533e5b5cfd5515c0b2e7e93ced22d05921