Merge "ExpireRange.java-sonar fix"