am 7e890a4d: am bda62724: Make encryption configurable

* commit '7e890a4d32816d34b30fb5d1f651d966d64bbf36':
  Make encryption configurable