am 5514aff4: am c3c7b92a: Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev

* commit '5514aff44d506ce23cd14d73962de335224db707':
  Clean up role of component name in media button event receiver