Update decrypt for 4.4

Change-Id: I8d5d7b6a49890e4707d70de8b429563de0d2ad99
Merge "Update decrypt for 4.4" into android-4.4