The AVX2 intrinsics vars were violating the pattern. Change-Id: I0bd2e270b7dbb173d753b2f5aeb48823efac4feb