am 9bd1c566: am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator) automerge: 620e409

* commit '9bd1c56603ef7f651508e13af2ffd82b7b192f5a':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)