Merge "Add adaptive playback test" into oc-mr1-dev am: f4570eb0d0
am: 7e8396f309

Change-Id: I5689acd7e2aec820ad4052846b2f204cdae05731