Merge "Multiple Sonar Fixes - AafNamespace.java"