am 8fc4d57d: Merge "Avoid a building error"

* commit '8fc4d57d41f532b90187b9404a8ac705770d75b4':
  Avoid a building error