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