Merge "DecryptHandle cleanup" am: a8129f7246 am: f1a372c179
am: f2bb7b0ccc

Change-Id: I028916e64c3635d33a5ef27a26c746513e75f23b