A stopgap measure to make Nearby to work for everyone with a link

Change-Id: I0ecf53cf912768d14bd998cb279e88a1858cb9e6
Merge "A stopgap measure to make Nearby to work for everyone with a link"