am 863d691e: Merge "Fix build"

* commit '863d691efaa92257246598a73af2f581fc991e0a':
  Fix build