Merge "Update setNullCipherAndIntegrityEnabled doc"