Edits to fix up v4a on G2

Change-Id: I6f4dd57ec67e96cb7a9c39c38d8b9f87dfb8f5f9