am 58b6d1be: build fix

Merge commit '58b6d1be26bd015b0da9336e82a83fd2cf303d2a'

* commit '58b6d1be26bd015b0da9336e82a83fd2cf303d2a':
  build fix