am 38e28e87: am 8dd719e4: Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev

* commit '38e28e87d2dc7966eef4db4ba48287427f0ea60d':
  Fix a typo that would cause us not to shutdown/flush the decoders in