am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev
automerge: 377d6f0

* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
  Fix issue with call backs from media process.