am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of...
am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of AdaptivePlaybackTest" into klp-dev
* commit '1613f475':
media: Refactor and improve robustness of AdaptivePlaybackTest