Merge "[ROBOT] Make Robot ServiceMesh compatible"