Merge "[AWARE] Metrics for Discovery + Ranging" into pi-dev