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

Change-Id: I9f0778aeb1f306cb28f228383e0b8033f9af2405