Merge "Fix null pointer dereference in auditParse"
am: 4380215033

Change-Id: I955a17f4b3a78e0762f7ae6058555fdea87a1123