am 08ff0e40: Merge "Fix memset call"

* commit '08ff0e408976d541dae0fc36527c15195cc86cda':
  Fix memset call