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

Change-Id: I42aa318daa851c634531e9b0868437a16a59abdd