Merge "Fix sonar build"
drwxr-xr-x - components