Merge "Update setNullCipherAndIntegrityEnabled API."