am 818b1423: (-s ours) Fix mako builds. Do not merge.

* commit '818b1423d228e478245a1b0d2fe687606ea1741c':
  Fix mako builds. Do not merge.