Merge "Rename some failed causes"
am: f6382802ef

Change-Id: I01b6d267c4b2cbf23d6cdc2dea770f5da99fa155