Merge "Revert "Start hwservicemanager earlier.""