Merge "AaflurService.java: Fixed sonar issues"