Merge "Revert "Rename some failed causes"" am: e3cc2e6c98
am: 90e2f900ca

Change-Id: I1b951e3b00983a364b4eef8edb6e5c1d032a3b43