Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp