Merge "Increase chrow row alignment to 16 bytes."