am 1da297f9: am f8fae863: Merge "Make sure resume() and flush() are handled...
am 1da297f9: am f8fae863: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
* commit '1da297f9':
Make sure resume() and flush() are handled appropriately even if the codec