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

Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9