Merge "Improve vid-simulator cloud-nativeness (fix)"