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

Change-Id: Ieaa64b9a5f92ccaed1ede82811ceab1f1224229c