am 5d8b7b22: Merge "Fix build."

* commit '5d8b7b22a53aecb01e4140216e2d949859c9991e':
  Fix build.