am 85ec1445: am f266873c: am 1c55797d: Fix build

* commit '85ec144538de6c27b22dff1bd45491a334f626ef':
  Fix build