am edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev

* commit 'edc24bb89c87d88c2da530812d64ae60d59a53e9':
  Make runhat command work again.