am 703cdab8: Merge "media: allow test to continue waiting for complete if...
am 703cdab8: Merge "media: allow test to continue waiting for complete if there\'s new encoder output" into lmp-mr1-dev
* commit '703cdab8':
media: allow test to continue waiting for complete if there's new encoder output