am 02b19843: am 27cf4ad8: Fix build.

Merge commit '02b19843d4fb28103cc4b21aa2017eeca795d87d'

* commit '02b19843d4fb28103cc4b21aa2017eeca795d87d':
  Fix build.