Merge "Fixes in SpikeEntityEventPolicy.java"