Merge "Bug fix in SIMD result detection." am: 6648da11ae
am: a48f973174

Change-Id: I533ade058574dbc4fcaf574def98d9652123582e