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

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