am b1824cfc: am 54901c9e: fix the build.  will revisit this change in a minute

Merge commit 'b1824cfca7dde367197662953b7478a9dbceab27'

* commit 'b1824cfca7dde367197662953b7478a9dbceab27':
  fix the build.  will revisit this change in a minute