Merge "Update docs to match encryption requirements" into pi-dev am: bfa13fe76f
am: ed11ba6182

Change-Id: I04f1c3d166c8c4cc243608b6bcffddb734dc482a