back to g2 naming

Change-Id: I8b000d7fd95c27a2461db434ca2b2f5c3e75c04c
Fix proprietary inclusion

Change-Id: I78d6c1d8292a1939ae3f9d58f279b04e6797b760