Merge "Rename some failed causes" am: f6382802ef
am: 4a862a637a

Change-Id: I0b9b904da6749028a6c8441550583a15a7acde4e