am 47e63bb4: Merge "Fix build."

* commit '47e63bb4e471a2b6ed0a3c20f386668809452840':
  Fix build.