Merge "Report uncrypt errors in details"
am: af8b9363c6

Change-Id: I5790f1c3ce902edf7bf9025e445b043c93036a30