am 9dedfd47: Fix encryption on certain devices

* commit '9dedfd473dc59e0277004e5b917e4eced02c8af5':
  Fix encryption on certain devices