Merge "{Event,Security}Log: Unify code"