am bda62724: Make encryption configurable

* commit 'bda6272446454886339841a62daaa1b66c07ad60':
  Make encryption configurable