g2: more updates

Change-Id: I5d753380ab78bc8dcb688fd8d79f8371b827103d