Merge "Fixed sonar issue in InputIterator.java"