[automerger skipped] Record system call relevant errors correctly am:...
[automerger skipped] Record system call relevant errors correctly am: 816b6a77 am: 809898c2 am: 760dd70d -s ours
am skip reason: Change-Id I781513e385e1cf2a77d1d052c4a450a94978e242 with SHA-1 23d55192 is in history
Change-Id: Id8eae8a5e9f2735ddd80b00f8ae00b5ddea921b8