Merge "Sonar Bug Fix- for EntityEventPolicy.java"