Merge "Fix sonar build issue for ves"