am 7c580cab: am b5f1e878: Fix build breakage.
automerge: 7478d51

* commit '7478d51f7042f6b78741058668060e87ce80a703':
  Fix build breakage.