Merge "{Event,Security}Log: Unify code" am: 0c614c7018
am: 812b09d6bd

Change-Id: I6ee5bbd2923ef7561739eb5cd14471ae87528a72