am ebb55cd3: Merge change 3558 into donut

Merge commit 'ebb55cd34415b3db39cbefba700721e5c606d699'

* commit 'ebb55cd34415b3db39cbefba700721e5c606d699':
  Fix the build