am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev

* commit '9d587a97b9cf89f85d1782a6af66bff487568945':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.