[NAN] Rename to make discovery explicit [DO NOT MERGE]
am: 1c29b381b6  -s ours

Change-Id: If62ce0ff1a26d89206a79777b82e06a5517aa46a