Merge "Fix a few comments in vectorization code that were incorrect or incomplete." am: 74b8ec0797
am: 9aaf93c76c

Change-Id: I7d0f4a77f29cdf5c985a70f08641df910a9b8416