Merge "Revert "DecryptHandle cleanup"" am: 43251208e3 am: 290638a8f6
am: b2b8453eed

Change-Id: I9ab184f3766b2d20a0f548ad65fd519dce515682