Merge "DirectAAFLur.java-sonar fix"