Merge "Sonar Fix: ExpireRange.java"