am 54e7f53f: Merge "Fix build."

* commit '54e7f53fce25366781840a124aa018534c4eb52b':
  Fix build.