Merge "Add AbstractDiscoveryProvider and Controller"
tree: 14fc9d81b77d5c660c8ab7cdc2a6f2ea42dba4c3
  1. nearby/