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

Change-Id: I6947796df7a7673081d30a38f529be239b7defaf