am 93d5ea6b: am 739f204f: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01

* commit '93d5ea6b9ce4803e50e754b0f21bce5e1da45bd0':