Merge "Switch to using kati env script" am: 7926e42209 am: d924c14097
am: f7f4ac1cfb

* commit 'f7f4ac1cfbfc594b0990666abb6d5b8f210e1652':
  Switch to using kati env script