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

Change-Id: Ibbedb611b805b9b2e39bf1dd2f3ea20940504f8e