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

Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406