am c5cb691c: Merge "Cleanup and improve stack map stream"

* commit 'c5cb691ca6a746a193bfbe3525aafa7cbb281d40':
  Cleanup and improve stack map stream