Merge "[wifi_score_params] Handle delete properly" into pi-dev