[automerger skipped] Record system call relevant errors correctly am:...
[automerger skipped] Record system call relevant errors correctly am: 816b6a77 -s ours am: 7d8075d1 -s ours am: bbada5d3 -s ours
am skip reason: Change-Id I781513e385e1cf2a77d1d052c4a450a94978e242 with SHA-1 23d55192 is in history
Change-Id: I976a4dc3499053e902c312dcfb493e855992cf4f