Merge "Initial OMA DRM forward lock contribution"