Merge "Include 6GHz in metrics and log" into rvc-dev