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