edit to ch047_data-encryption

stoarge to storage typo fix small cleanup

Change-Id: If42845249969aa810f1ed9ffb6d65ab1c5420945
Merge "edit to ch047_data-encryption"