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

* commit 'bf37ff6b9293a3d062ab75ac94376b49ab85630a':
  Fix sizeof -> strlen to get the test to run on build servers.