am 06dbc228: am 9dedfd47: Fix encryption on certain devices

* commit '06dbc22839ff8e411405f6b9c0635cdd0fd8b4d5':
  Fix encryption on certain devices