Merge "Late binding: support NullCipher"