z: bring inline with g2

Change-Id: I5798dffff2dae458759030d4efba458bc35ec121