am 4f5434f3: am e5715521: am 2d9f4620: Fix build

* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
  Fix build