am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-dev

* commit '37ad1f1273dd579b84317be6d1a9a27ad32af88c':
  Force write to disk while doing uncrypt