Merge "Update SDC sonar jjb"