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

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