Merge "refactor(rme): reorg existing RMMD EL3 service FIDs" into integration