Merge "Fix PlatformCompatDashboardTest." into rvc-dev