am ab5741de: (-s ours) am 2f32cda6: DO NOT MERGE Retry unmounts in ext4 encryption

* commit 'ab5741de494d7a5c8482b5c7ba7cbd1b7fd50bcf':
  DO NOT MERGE Retry unmounts in ext4 encryption