Merge "Sonar fix: Upload.java"