am 995846a4: am d147203b: am ad2be762: Merge "Fix null pointer dereference when security exception occurs"

* commit '995846a4310ef4270177bf9d6c6673827b5625af':
  Fix null pointer dereference when security exception occurs