15c446b5e5
automerge: 7478d51 * commit '7478d51f7042f6b78741058668060e87ce80a703': Fix build breakage.
automerge: 7478d51 * commit '7478d51f7042f6b78741058668060e87ce80a703': Fix build breakage.