Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp
am: 4c3f6ab8f7

Change-Id: I50e5c8484768c10604bd78ce7bba5c2e83bc6f04