Merge "Start hwservicemanager earlier."