Merge "When system server goes down, crash apps more." into nyc-dev
am: 004bf6ade3

* commit '004bf6ade3e7e400c896541cce0e513eef179738':
  When system server goes down, crash apps more.