am 884aee7e: am 0e76c6e0: am c5cb691c: Merge "Cleanup and improve stack map stream"

* commit '884aee7eee0733d85d879081879fcb8c0c343e17':
  Cleanup and improve stack map stream