Merge "DRM: optional 1.0 to 1.2."