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

Change-Id: Iba392936c14c0af584b0dcb94bc65670cb94473e