Merge "Add/update strings for wifi wake and open networks"