Merge "Refine error causes to make them more clear" am: db4cc673f5
am: 291c63b21b

Change-Id: I8b50ec7b78663f1da3014cccc1bf225a5da0a843