am 4248250c: am 8017c647: Fix build

* commit '4248250c936ded1d5c32b47681817c52f0600c7e':
  Fix build