am 90bd1873: Merge "Fix build"

* commit '90bd18737a5ce16708003363683744cfd0480d83':
  Fix build