Merge "Revert "Don't use framework strings for formatting file sizes""