Merge "Merge \"Don\'t force fstrim on OTA\" into nyc-mr1-dev am: bef41bf5" into nyc-mr1-dev-plus-aosp