Merge "AbsTrans.java-sonar fixes"