[automerger skipped] Merge changes from topic "add-error-code" am: b375f0bd...
[automerger skipped] Merge changes from topic "add-error-code" am: b375f0bd -s ours am: 87c3e878 -s ours
am skip reason: Change-Id Ifb9c1a11f48e191f7d49384946f9fd78d81b84dc with SHA-1 2c3cc828 is in history
Change-Id: I12e913059ea920017cc665a083bac0a18dd02e51