am 1ca9b13b: am 3ecd58c6: Fix build

Merge commit '1ca9b13bf4b0b95c1beeb11732e3f2af376551e9'

* commit '1ca9b13bf4b0b95c1beeb11732e3f2af376551e9':
  Fix build