Merge "Revert "DecryptHandle cleanup""
am: 43251208e3

Change-Id: Ief6609328e84f298aa23b9fbc8fab7fa4651b7a2