Merge "DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips" into mnc-dev
Marco Nelissen authored
am: 403dec0a  -s ours

* commit '403dec0a':
  DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips
d8ef5fd6