Merge "Fixed sonar issue in PolicyReader.java"