am 8fa3f443: am 54e7f53f: Merge "Fix build."

* commit '8fa3f44342f3089aaf48de5c5a6f5a3e5d346cc7':
  Fix build.