Merge "Skip tests when the drm scheme is not installed" into oc-dev
am: fdde895c34

Change-Id: I612f7a996e1c1d287b779c444d3488c311da4900