Merge "Always have an AutomaticOnOffKeepalive to manage a KI"