Merge "init_kill_services_test: smoreland@ owners" into main