Merge "Revert "Revert "Start hwservicemanager earlier."""