Merge "Don't force fstrim on OTA" into nyc-mr1-dev