am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev

* commit '64f369a542952a8ac0d22d7d6c4c793a29ebfc52':
  Avoid runtime restart after vold reconnects.