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

Change-Id: Ie75601a15a58f76cb7ca806355b7f62af470d7c2