Merge "Add missing report of error code under recovery" am: 571855b0e6
am: 736be2f93e

Change-Id: Ia2be72d6efac6be06178640c3b6ab716e99c6edf