am a413a4ae: Fix the build.  DO NOT MERGE

* commit 'a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
  Fix the build.  DO NOT MERGE