am ffdc7aed: Merge "avoid crashing system serer process"

* commit 'ffdc7aed5ec8f38706ddfad02d3df05493351083':
  avoid crashing system serer process