Merge "Fix OpenRoadmInterface710 portmapping revision"