Merge "DecryptHandle cleanup" am: a8129f7246
am: f1a372c179

Change-Id: I6ed050b13258059a7e2d8fd2baa25a1bed92bab0