Merge "Fix sizeof -> strlen to get the test to run on build servers."