Merge "Fix pointer arithmetic on a void*" am: 306b1d9d66
am: 27fb606196

* commit '27fb60619645eb440ae3aeb164cd7640ccb6c79d':
  Fix pointer arithmetic on a void*