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

* commit '42b470138d56372967c353f2066841f0c34be266':