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