am: d7d7fe0e * commit 'd7d7fe0e': DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips