am bf97da4d: am a3be7d18: am cb1183d6: videosnapshot memory corruption fixes.

* commit 'bf97da4dfacdb7d8a5555d6aef166d782f6d0e05':
  videosnapshot memory corruption fixes.