Merge "Log.java: Fixed sonar issues"