am 3379c1cb: Fix broken build automerge: 2652c57
automerge: 304f696

* commit '304f696b34592d0eb75339da91a71864884322c1':
  Fix broken build