135636 - Automatically enable or disable end-to-end encrypti