am fb20f277: am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"

* commit 'fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0':
  Don't replace file extension when mime-type is incorrect