am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1

* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
  Fix for Media Server memory leak