am 18a36af4: (-s ours) am 37f83eb8: Merge "Remove SLP vectorization workaround."

* commit '18a36af443bbd9dd1ed3d37cd86bc424ea6d6f48':