am 04511126: am d586e356: Merge "Fix build."

* commit '04511126a6e127705abce84735a3fe4eb48d882c':
  Fix build.