am 610854bd: am 95bb350f: Fix NPE when adding account with security policy

* commit '610854bd0ef393ac2df03c0d52f0ee7dbda9b16c':
  Fix NPE when adding account with security policy