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

Change-Id: I7cef4abe0dac124795566cb8f556990aef5a60c8