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

* commit 'aa96db5ba0a39d8fac0925871632031d21e1ab3e':
  Fix mako builds. Do not merge.