Merge "Add adaptive playback test" into oc-mr1-dev