am 01eb7f72: Merge "Fix broken build"

* commit '01eb7f72434830bb14cec906d885d2b7ee40d53b':
  Fix broken build