Merge "Fix renameForFuse method in MediaProvider" into tm-mainline-prod