Make nearby a discovery tool

Incorrectly it was described as a personal tool

Change-Id: Ie072444fdf36f2b73be2ce11762e831f2c228258
Merge "Make nearby a discovery tool"