Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev