Merge "Be increasingly aggressive about fstrim if it isn't being run" into lmp-dev