Merge "Improve isunit computation, some tests edits needed for SIMD."
am: 68948e01f5

Change-Id: I444830552635b6dad2c62cd4df0675e498f90e31