Incorporate NTLM library upgrade to r18.