am 0c072553: am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev

* commit '0c072553f20085b18e6204afc8818b7922bffa9d':
  Fix a mediaserver crash caused by dereferencing a NULL pointer.