Merge "DecryptHandle cleanup"
am: a8129f7246

Change-Id: Ic3cdf5aee592514f48beaac88b139600ffbcf8d5