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

Change-Id: Ia8cc58809c774752172846a5897b7b71489892e7