Merge changes I9971c466,Ib42474fd into mnc-dev

* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
tree: 6de866c55f4ed706dafa7826e6d20d1943a84c3d
  1. core/
  2. services/
  3. wifi/