Merge "Remove ~1/3 of the installd calls at boot."