Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46
am: ad864c8fd9

Change-Id: I338cd7ddf54997bdf19a95056e5793103ffc2e23