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

Change-Id: Iea81963ea09510a5c3d1c8d801dde83201122743