am: e540b64aaf * commit 'e540b64aaf58460f7930a5e4937cee660215c948': NAN: baseline NAN manager for discovery.