[automerger skipped] Merge "Add more error codes." am: 53484a49 am:...
[automerger skipped] Merge "Add more error codes." am: 53484a49 am: b17c13a6 -s ours am: 01ace121 -s ours
am skip reason: Change-Id I6f386bfcf75236e30141fab89e2b62ee3a8cb59e with SHA-1 12e0e6d2 is in history
Change-Id: I852653256f4c133b2820bc00b338ebdbed765241