am e79af7df: Merge "Fix build."

* commit 'e79af7dffbd4c41ab756c5b0888e28bbb317aab3':
  Fix build.