Merge "EntityEventPolicy: fix CER issue"