am 159cceaa: am 368d796e: Fix build.

Merge commit '159cceaae22076b743626ddde84c501b3f491f6e'

* commit '159cceaae22076b743626ddde84c501b3f491f6e':
  Fix build.