am 4b84a5a7: am dd3b86e2: am 927fbe57: Merge "mediaserver: fix HDCP failures"

* commit '4b84a5a7192289ee54ebba157d9b6490b4d500ba':
  mediaserver: fix HDCP failures