Merge "Add more specific error codes for uncrypt failures" am: 3ff8a5e2a4 am: 6f30535229 am: a86d24829b am: ce47e3792f
am: 181d514cf1

Change-Id: I0b7d24cea07ce9c51550ca73d36a457d6deddc8e