Merge "Wait for installd to finish starting before booting." into jb-mr1-dev