Merge "SecurityLog: Apply 7b25bb8 to SecurityLog" am: a98866a6b6
am: a25528b085

Change-Id: Id6e6138b23c962bcd248e12de67e485782bb13aa