Merge "Fix Sonar and CheckStyle warnings"