Android CTS 7.0 Release 30 (5353406)
Merge "DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips" into mnc-dev am: 403dec0afc  -s ours am: d8ef5fd60e
am: 90a39f0ae8  -s ours

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