am 666380e9: am edf45678: Merge "Fix broken volantis build"

* commit '666380e901fc80792fa4fa77b2b29e9b3236af91':
  Fix broken volantis build