Merge "Replace strlen() calls with strict string comparisons"