Merge "Add more error codes."
am: 53484a4946

Change-Id: Idc0f2f8dd76279e4bb1e9260be2418aef0e32e41