am 60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev

* commit '60ac308e1da302716fd6c5d805c513221039bac2':
  Defend against a system server crash.