Add files to remove WITHOUT_NIS

PR:		186412