Merge "Sonar issues in SynchronizerTask.java"