DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d  -s ours
am: 2eea42f723  -s ours

Change-Id: Ie6d9a47705e023565ff9fed8676be0ca63df68a8