am 4fdf09c3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '4fdf09c3103074770675b40c9fb5e47c04617c61':
  Fix encryption on certain devices