Merge "Fix sonar build"
tree: c9a8de5defecf6634942f5cf4342fdcc84bccceb
  1. components/