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

Change-Id: Ie13fff01d2305696e9e08f3529363206091d9b5a