Story 430: Promote nearby to beta

Change-Id: Id93cfc77eea56c2a999e5ebf18f3c2035e2f1628
Merge "Story 430: Promote nearby to beta"