Merge "DirectIntrospect.java -SonarFix Issue-ID: AAF-468 Change-Id: Icc44780f37e0aa8c...