Merge "Stop verifying wifi disconnect on T+ devices"