am 507ea24b: am ffdc7aed: Merge "avoid crashing system serer process"

* commit '507ea24b8f881f8af42393a0512c88cf7397edb9':
  avoid crashing system serer process