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

Change-Id: I247b4a2159a03325ec9fe998f571d4fc71955da5