g2: updates

Change-Id: I3c4f7e2c134cbbbfb119fd1d46018bf705d9942d
test22

Change-Id: I48455035cb9f34b6e98112b12c9250f03b4f2ace