Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS"