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

Change-Id: I82c8bfb9a5f08d7ca205b2f18282f5346709b2e0