Follow our own G3-common + vs985

Change-Id: Ic4866d79de61dc885f35f65e7134b83b2151487b