this is my ammended commit message:
```
add support for encryption

Closes-Bug: #1921861

Change-Id: I73e548ac208a96ddaa687a1b5fbb22cac20037d0
```