Merge "Revert "[4/n] FRR data cleanup"" into udc-qpr-dev