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

Change-Id: I91ef9fbc0731ce2397e1ca9aff7c8349022dad44