Merge "Fix null pointer dereference in auditParse" am: 4380215033 am: 9b7d7a00d0
am: b47627f0cf

Change-Id: Ib1d1aaf251d17f3fbf849d7ee751b5bfe01a7cbd