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

Change-Id: Ic71e0eced353dfdfb989876ddb4c11f4188625c5