Merge "Sonar Fix: JsonResponse.java"