[automerger skipped] Merge "Add more error codes." am: 53484a4946 am: b17c13a61f -s ours am: 01ace12121 -s ours
am skip reason: Change-Id I6f386bfcf75236e30141fab89e2b62ee3a8cb59e with SHA-1 12e0e6d24b is in history

Change-Id: I852653256f4c133b2820bc00b338ebdbed765241