am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"

* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
  Bug fixes in OMA DRM v1 Forward Lock Agent