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

* commit '91b57293233e005ce97c655578c775aaaf95a745':
  Avoid runtime restart after vold reconnects.