Merge "Setting up sonar job for rapp ics version"