Merge "Don't ostensibly back off fstrim but then do it anyway" into mnc-dev