Merge "Look for hwservicemanager in it's old location as well" into main