Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"