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

* commit 'd6db7eacc983e22eb88fc7b465f290670127569a':
  Don't ostensibly back off fstrim but then do it anyway