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

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