Merge "Re-add support string that was being used by wifi"